Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 4 Jul 2011 03:22:04 +0000 (20:22 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 4 Jul 2011 03:22:04 +0000 (20:22 -0700)
commit52930a75725851e7eea7d73d26817752eb9a1ecb
treec1681c555bb6a8843fc167afd093f17b2916ad6b
parent75200c366f3223f1cd1462eb265e5e20858f1c7e
parent7100ff52666a648aab4dc02bc652071123dffc76
Merge from trunk.